Resize the popup if a new model is set. (#154129, Bernd Damian)

2004-10-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcombobox.c (gtk_combo_box_set_model): Resize the
	popup if a new model is set.  (#154129, Bernd Damian)

diff --git a/ChangeLog b/ChangeLog
index bb465d1aea73cadf77e92ae72786996fa30a2e27..0aefd21f1d37b86537447c32b961a8691729386d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_model): Resize the
+       popup if a new model is set.  (#154129, Bernd Damian)
+
 2004-10-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bb465d1aea73cadf77e92ae72786996fa30a2e27..0aefd21f1d37b86537447c32b961a8691729386d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_model): Resize the
+       popup if a new model is set.  (#154129, Bernd Damian)
+
 2004-10-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bb465d1aea73cadf77e92ae72786996fa30a2e27..0aefd21f1d37b86537447c32b961a8691729386d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_model): Resize the
+       popup if a new model is set.  (#154129, Bernd Damian)
+
 2004-10-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bb465d1aea73cadf77e92ae72786996fa30a2e27..0aefd21f1d37b86537447c32b961a8691729386d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcombobox.c (gtk_combo_box_set_model): Resize the
+       popup if a new model is set.  (#154129, Bernd Damian)
+
 2004-10-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): 

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 79c0d9262150f9cb07ce85cf160fd8d085a41b8d..14c5ad47c417a9a293220aed09614597cb357efc 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4400,6 +4400,7 @@ gtk_combo_box_set_model (GtkComboBox  *combo_box,
       /* list mode */
       gtk_tree_view_set_model (GTK_TREE_VIEW (combo_box->priv->tree_view),
                                combo_box->priv->model);
+      gtk_combo_box_list_popup_resize (combo_box);
     }
   else
     {